(read_char): Handle unread events from popup menus.

diff --git a/src/keyboard.c b/src/keyboard.c
index 74614ce2f10f931f257d4e4e11e4a0743b7a34d2..04291a24105bfbe6557bbc675fe67b135a7619fb 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1700,6 +1700,13 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
       c = XCONS (Vunread_command_events)->car;
       Vunread_command_events = XCONS (Vunread_command_events)->cdr;
 
+      /* Undo what read_char_x_menu_prompt did when it unread
+        additional keys returned by Fx_popup_menu.  */
+      if (CONSP (c)
+         && (SYMBOLP (XCONS (c)->car) || INTEGERP (XCONS (c)->car))
+         && NILP (XCONS (c)->cdr))
+       c = XCONS (c)->car;
+
       if (this_command_key_count == 0)
        goto reread_first;
       else